auto merge of #918 : alexcrichton/cargo/issue-912, r=brson
authorbors <bors@rust-lang.org>
Mon, 24 Nov 2014 19:14:30 +0000 (19:14 +0000)
committerbors <bors@rust-lang.org>
Mon, 24 Nov 2014 19:14:30 +0000 (19:14 +0000)
commit515f371a2dd2b55ec228d05587a9cda6ab999314
tree86e0ce27dc115dbbb4c1d26f9500b8a26d693446
parentde5bc1e663f834004d0e4a1fbce220a17a6cca28
parentd15aaa821faced38186be2b1b062e45e8c44d631
auto merge of #918 : alexcrichton/cargo/issue-912, r=brson

This forgot to take into account the logic from some other locations, so I added
a helper method!

Closes #912